bitkeeper revision 1.1159.1.130 (413dab6fQ1jHzBNKBK5rX_nzCQLANA)

Make writable pagetables a domain creation option.

diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h
index 0da159d8703c304e5654201825dbde86984276ae..06ce01df69ffa3f8d96cfb5434deba46de0acbf4 100644 (file)
--- a/tools/libxc/xc.h
+++ b/tools/libxc/xc.h
@@ -230,6 +230,11 @@ int xc_domain_setmaxmem(int xc_handle,
                             u32 domid, 
                             unsigned int max_memkb);
 
+int xc_domain_setvmassist(int xc_handle,
+                          u32 domid, 
+                          unsigned int cmd,
+                          unsigned int type);
+
 
 void *xc_map_foreign_range(int xc_handle, u32 dom,
                             int size, int prot,

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 6fab304f2efa03a824917856fe91f19722eefbd0..d50276fe3ba6d034675a02537d97c8ae40ebde55 100644 (file)
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -256,3 +256,15 @@ int xc_domain_setmaxmem(int xc_handle,
     return do_dom0_op(xc_handle, &op);
 }
 
+int xc_domain_setvmassist(int xc_handle,
+                          u32 domid, 
+                          unsigned int cmd,
+                          unsigned int type)
+{
+    dom0_op_t op;
+    op.cmd = DOM0_SETDOMAINVMASSIST;
+    op.u.setdomainvmassist.domain = (domid_t)domid;
+    op.u.setdomainvmassist.cmd = cmd;
+    op.u.setdomainvmassist.type = type;
+    return do_dom0_op(xc_handle, &op);
+}

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index ea504c12e80a8f5f1288ae521cd6ce5648f73bc7..bb44e27baca31151ebc129802a35ae59df0ab32f 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -14,12 +14,19 @@
 #define round_pgup(_p)    (((_p)+(PAGE_SIZE-1))&PAGE_MASK)
 #define round_pgdown(_p)  ((_p)&PAGE_MASK)
 
+struct domain_setup_info
+{
+    unsigned long v_start;
+    unsigned long v_kernstart;
+    unsigned long v_kernend;
+    unsigned long v_kernentry;
+
+    unsigned int use_writable_pagetables;
+};
+
 static int parseelfimage(char *elfbase, 
                          unsigned long elfsize,
-                         unsigned long *pvirtstart,
-                         unsigned long *pkernstart,
-                         unsigned long *pkernend,
-                         unsigned long *pkernentry);
+                         struct domain_setup_info *dsi);
 static int loadelfimage(char *elfbase, void *pmh, unsigned long *parray,
                         unsigned long vstart);
 
@@ -77,7 +84,7 @@ static int setup_guestos(int xc_handle,
                          const char *cmdline,
                          unsigned long shared_info_frame,
                          unsigned int control_evtchn,
-                        unsigned long flags)
+                         unsigned long flags)
 {
     l1_pgentry_t *vl1tab=NULL, *vl1e=NULL;
     l2_pgentry_t *vl2tab=NULL, *vl2e=NULL;
@@ -95,10 +102,7 @@ static int setup_guestos(int xc_handle,
     unsigned long ppt_alloc;
     unsigned long *physmap, *physmap_e, physmap_pfn;
 
-    unsigned long v_start;
-    unsigned long vkern_start;
-    unsigned long vkern_entry;
-    unsigned long vkern_end;
+    struct domain_setup_info dsi;
     unsigned long vinitrd_start;
     unsigned long vinitrd_end;
     unsigned long vphysmap_start;
@@ -111,12 +115,17 @@ static int setup_guestos(int xc_handle,
     unsigned long vpt_end;
     unsigned long v_end;
 
-    rc = parseelfimage(image, image_size, &v_start,
-                       &vkern_start, &vkern_end, &vkern_entry);
+    memset(&dsi, 0, sizeof(struct domain_setup_info));
+
+    rc = parseelfimage(image, image_size, &dsi);
     if ( rc != 0 )
         goto error_out;
-    
-    if ( (v_start & (PAGE_SIZE-1)) != 0 )
+
+    if (dsi.use_writable_pagetables)
+        xc_domain_setvmassist(xc_handle, dom, VMASST_CMD_enable,
+                              VMASST_TYPE_writable_pagetables);
+
+    if ( (dsi.v_start & (PAGE_SIZE-1)) != 0 )
     {
         PERROR("Guest OS must load to a page boundary.\n");
         goto error_out;
@@ -131,7 +140,7 @@ static int setup_guestos(int xc_handle,
      */
     for ( nr_pt_pages = 2; ; nr_pt_pages++ )
     {
-        vinitrd_start    = round_pgup(vkern_end);
+        vinitrd_start    = round_pgup(dsi.v_kernend);
         vinitrd_end      = vinitrd_start + initrd_len;
         vphysmap_start   = round_pgup(vinitrd_end);
         vphysmap_end     = vphysmap_start + (nr_pages * sizeof(unsigned long));
@@ -144,7 +153,7 @@ static int setup_guestos(int xc_handle,
         v_end            = (vstack_end + (1<<22)-1) & ~((1<<22)-1);
         if ( (v_end - vstack_end) < (512 << 10) )
             v_end += 1 << 22; /* Add extra 4MB to get >= 512kB padding. */
-        if ( (((v_end - v_start + ((1<<L2_PAGETABLE_SHIFT)-1)) >> 
+        if ( (((v_end - dsi.v_start + ((1<<L2_PAGETABLE_SHIFT)-1)) >> 
                L2_PAGETABLE_SHIFT) + 1) <= nr_pt_pages )
             break;
     }
@@ -157,20 +166,20 @@ static int setup_guestos(int xc_handle,
            " Start info:    %08lx->%08lx\n"
            " Boot stack:    %08lx->%08lx\n"
            " TOTAL:         %08lx->%08lx\n",
-           vkern_start, vkern_end, 
+           dsi.v_kernstart, dsi.v_kernend, 
            vinitrd_start, vinitrd_end,
            vphysmap_start, vphysmap_end,
            vpt_start, vpt_end,
            vstartinfo_start, vstartinfo_end,
            vstack_start, vstack_end,
-           v_start, v_end);
-    printf(" ENTRY ADDRESS: %08lx\n", vkern_entry);
+           dsi.v_start, v_end);
+    printf(" ENTRY ADDRESS: %08lx\n", dsi.v_kernentry);
 
-    if ( (v_end - v_start) > (nr_pages * PAGE_SIZE) )
+    if ( (v_end - dsi.v_start) > (nr_pages * PAGE_SIZE) )
     {
         printf("Initial guest OS requires too much space\n"
                "(%luMB is greater than %luMB limit)\n",
-               (v_end-v_start)>>20, (nr_pages<<PAGE_SHIFT)>>20);
+               (v_end-dsi.v_start)>>20, (nr_pages<<PAGE_SHIFT)>>20);
         goto error_out;
     }
 
@@ -189,13 +198,13 @@ static int setup_guestos(int xc_handle,
         goto error_out;
     }
 
-    loadelfimage(image, pm_handle, page_array, v_start);
+    loadelfimage(image, pm_handle, page_array, dsi.v_start);
 
     /* Load the initial ramdisk image. */
     if ( initrd_len != 0 )
     {
-        for ( i = (vinitrd_start - v_start); 
-              i < (vinitrd_end - v_start); i += PAGE_SIZE )
+        for ( i = (vinitrd_start - dsi.v_start); 
+              i < (vinitrd_end - dsi.v_start); i += PAGE_SIZE )
         {
             char page[PAGE_SIZE];
             if ( gzread(initrd_gfd, page, PAGE_SIZE) == -1 )
@@ -212,7 +221,7 @@ static int setup_guestos(int xc_handle,
         goto error_out;
 
     /* First allocate page for page dir. */
-    ppt_alloc = (vpt_start - v_start) >> PAGE_SHIFT;
+    ppt_alloc = (vpt_start - dsi.v_start) >> PAGE_SHIFT;
     l2tab = page_array[ppt_alloc++] << PAGE_SHIFT;
     ctxt->pt_base = l2tab;
 
@@ -220,8 +229,8 @@ static int setup_guestos(int xc_handle,
     if ( (vl2tab = map_pfn_writeable(pm_handle, l2tab >> PAGE_SHIFT)) == NULL )
         goto error_out;
     memset(vl2tab, 0, PAGE_SIZE);
-    vl2e = &vl2tab[l2_table_offset(v_start)];
-    for ( count = 0; count < ((v_end-v_start)>>PAGE_SHIFT); count++ )
+    vl2e = &vl2tab[l2_table_offset(dsi.v_start)];
+    for ( count = 0; count < ((v_end-dsi.v_start)>>PAGE_SHIFT); count++ )
     {    
         if ( ((unsigned long)vl1e & (PAGE_SIZE-1)) == 0 )
         {
@@ -232,13 +241,13 @@ static int setup_guestos(int xc_handle,
                                              l1tab >> PAGE_SHIFT)) == NULL )
                 goto error_out;
             memset(vl1tab, 0, PAGE_SIZE);
-            vl1e = &vl1tab[l1_table_offset(v_start + (count<<PAGE_SHIFT))];
+            vl1e = &vl1tab[l1_table_offset(dsi.v_start + (count<<PAGE_SHIFT))];
             *vl2e++ = l1tab | L2_PROT;
         }
 
         *vl1e = (page_array[count] << PAGE_SHIFT) | L1_PROT;
-        if ( (count >= ((vpt_start-v_start)>>PAGE_SHIFT)) && 
-             (count <  ((vpt_end  -v_start)>>PAGE_SHIFT)) )
+        if ( (count >= ((vpt_start-dsi.v_start)>>PAGE_SHIFT)) && 
+             (count <  ((vpt_end  -dsi.v_start)>>PAGE_SHIFT)) )
             *vl1e &= ~_PAGE_RW;
         vl1e++;
     }
@@ -246,7 +255,7 @@ static int setup_guestos(int xc_handle,
     unmap_pfn(pm_handle, vl2tab);
 
     /* Write the phys->machine and machine->phys table entries. */
-    physmap_pfn = (vphysmap_start - v_start) >> PAGE_SHIFT;
+    physmap_pfn = (vphysmap_start - dsi.v_start) >> PAGE_SHIFT;
     physmap = physmap_e = 
         map_pfn_writeable(pm_handle, page_array[physmap_pfn++]);
     for ( count = 0; count < nr_pages; count++ )
@@ -274,7 +283,7 @@ static int setup_guestos(int xc_handle,
         goto error_out;
 
     start_info = map_pfn_writeable(
-        pm_handle, page_array[(vstartinfo_start-v_start)>>PAGE_SHIFT]);
+        pm_handle, page_array[(vstartinfo_start-dsi.v_start)>>PAGE_SHIFT]);
     memset(start_info, 0, sizeof(*start_info));
     start_info->nr_pages     = nr_pages;
     start_info->shared_info  = shared_info_frame << PAGE_SHIFT;
@@ -309,7 +318,7 @@ static int setup_guestos(int xc_handle,
     free(page_array);
 
     *pvsi = vstartinfo_start;
-    *pvke = vkern_entry;
+    *pvke = dsi.v_kernentry;
 
     return 0;
 
@@ -551,10 +560,7 @@ static inline int is_loadable_phdr(Elf_Phdr *phdr)
 
 static int parseelfimage(char *elfbase, 
                          unsigned long elfsize,
-                         unsigned long *pvirtstart,
-                         unsigned long *pkernstart,
-                         unsigned long *pkernend,
-                         unsigned long *pkernentry)
+                         struct domain_setup_info *dsi)
 {
     Elf_Ehdr *ehdr = (Elf_Ehdr *)elfbase;
     Elf_Phdr *phdr;
@@ -643,13 +649,16 @@ static int parseelfimage(char *elfbase,
         return -EINVAL;
     }
 
-    *pvirtstart = kernstart;
+    dsi->v_start = kernstart;
     if ( (p = strstr(guestinfo, "VIRT_BASE=")) != NULL )
-        *pvirtstart = strtoul(p+10, &p, 0);
+        dsi->v_start = strtoul(p+10, &p, 0);
+
+    if ( (p = strstr(guestinfo, "PT_MODE_WRITABLE")) != NULL )
+        dsi->use_writable_pagetables = 1;
 
-    *pkernstart = kernstart;
-    *pkernend   = kernend;
-    *pkernentry = ehdr->e_entry;
+    dsi->v_kernstart = kernstart;
+    dsi->v_kernend   = kernend;
+    dsi->v_kernentry = ehdr->e_entry;
 
     return 0;
 }

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index d66d407aabcd2baa4e2929fb3f41c0e18aae2b3d..8bbe2968b28310f611baa67daf2aacdf01b6856f 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -601,6 +601,10 @@ int construct_dom0(struct domain *p,
     if ( rc != 0 )
         return rc;
 
+    /* Set up domain options */
+    if ( dsi.use_writable_pagetables )
+        vm_assist(p, VMASST_CMD_enable, VMASST_TYPE_writable_pagetables);
+
     if ( (dsi.v_start & (PAGE_SIZE-1)) != 0 )
     {
         printk("Initial guest OS must load to a page boundary.\n");
@@ -769,10 +773,6 @@ int construct_dom0(struct domain *p,
             l1start = l1tab = (l1_pgentry_t *)l2_pgentry_to_phys(*l2tab);
     }
 
-    /* Set up domain options */
-    if (dsi.use_writable_pagetables)
-        vm_assist(p, VMASST_CMD_enable, VMASST_TYPE_writable_pagetables);
-
     /* Set up shared-info area. */
     update_dom_time(p->shared_info);
     p->shared_info->domain_time = 0;

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index 5d95cdf184303612aa4b61db8b049a21dbf367ee..5eb31b736c1ff75d96766194537203d398c9900e 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -654,6 +654,21 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
     }
     break;
 
+    case DOM0_SETDOMAINVMASSIST:
+    {
+        struct domain *d; 
+        ret = -ESRCH;
+        d = find_domain_by_id( op->u.setdomainmaxmem.domain );
+        if ( d != NULL )
+        {
+           vm_assist(d, op->u.setdomainvmassist.cmd,
+                      op->u.setdomainvmassist.type);
+            put_domain(d);
+            ret = 0;
+        }
+    }
+    break;
+
     default:
         ret = arch_do_dom0_op(op,u_dom0_op);
 

diff --git a/xen/include/hypervisor-ifs/dom0_ops.h b/xen/include/hypervisor-ifs/dom0_ops.h
index 2bae662d12cc86f6cc215c7029bddf0c84ede832..c7e51455d269206f252efaaf820b83452597b6f6 100644 (file)
--- a/xen/include/hypervisor-ifs/dom0_ops.h
+++ b/xen/include/hypervisor-ifs/dom0_ops.h
@@ -341,6 +341,15 @@ typedef struct {
     MEMORY_PADDING;
 } PACKED dom0_getpageframeinfo2_t; /* 24 bytes */
 
+#define DOM0_SETDOMAINVMASSIST   30
+typedef struct {
+    /* IN variables. */
+    domid_t      domain;              /*  0 */
+    u16          __pad0;
+    u32          cmd;                 /*  4: vm_assist cmd */
+    u32          type;                /*  8: vm_assist cmd */
+} PACKED dom0_setdomainvmassist_t; /* 12 bytes */
+
 typedef struct {
     u32 cmd;                          /* 0 */
     u32 interface_version;            /* 4 */ /* DOM0_INTERFACE_VERSION */
@@ -371,6 +380,7 @@ typedef struct {
        dom0_setdomaininitialmem_t setdomaininitialmem;
        dom0_setdomainmaxmem_t   setdomainmaxmem;
        dom0_getpageframeinfo2_t getpageframeinfo2;
+       dom0_setdomainvmassist_t setdomainvmassist;
     } PACKED u;
 } PACKED dom0_op_t; /* 80 bytes */